Steal ATTACHED_MENUS list so its tail isn't freed when we re-set it,

2004-08-25  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
	list so its tail isn't freed when we re-set it, noticed
	by Hans Petter Jansson.

diff --git a/ChangeLog b/ChangeLog
index 515cc25a7b5721735d8241f7ebb2f69edb09c66e..860346d4ec08719bb464b7d545767d7f1e7abed8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
+       list so its tail isn't freed when we re-set it, noticed
+       by Hans Petter Jansson.
+
        * gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix
        a typo, noticed by Tim Janik.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 515cc25a7b5721735d8241f7ebb2f69edb09c66e..860346d4ec08719bb464b7d545767d7f1e7abed8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-08-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
+       list so its tail isn't freed when we re-set it, noticed
+       by Hans Petter Jansson.
+
        * gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix
        a typo, noticed by Tim Janik.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 515cc25a7b5721735d8241f7ebb2f69edb09c66e..860346d4ec08719bb464b7d545767d7f1e7abed8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-08-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
+       list so its tail isn't freed when we re-set it, noticed
+       by Hans Petter Jansson.
+
        * gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix
        a typo, noticed by Tim Janik.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 515cc25a7b5721735d8241f7ebb2f69edb09c66e..860346d4ec08719bb464b7d545767d7f1e7abed8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-08-25  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
+       list so its tail isn't freed when we re-set it, noticed
+       by Hans Petter Jansson.
+
        * gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix
        a typo, noticed by Tim Janik.
 

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 588e8a9ca3c286cbe5275d3d470b34ca0c2711ee..d4be6416fdaca5debbea337719948a15cae532c7 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1037,7 +1037,7 @@ gtk_menu_attach_to_widget (GtkMenu               *menu,
   
   data->detacher = detacher;
   g_object_set_data (G_OBJECT (menu), attach_data_key, data);
-  list = g_object_get_data (G_OBJECT (attach_widget), ATTACHED_MENUS);
+  list = g_object_steal_data (G_OBJECT (attach_widget), ATTACHED_MENUS);
   if (!g_list_find (list, menu))
     {
       list = g_list_prepend (list, menu);